clipboard: Add the useful stuff from reverted commit

This is the parts of dc50e0637ffa8bc7a369d00a5d8e7656d03c3781 that
should have been committed but were reverted in
b5c62cf86fe37e05ce2a0ae050df2a229457676b to unbreak the build.

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index d167c2b7c633f09c5ce880e7db59b9778739bb42..cdc3b8801709866f468673fb32759c6f6ceb3fed 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -1306,6 +1306,9 @@ gdk_clipboard_read_texture_finish
 gdk_clipboard_read_text_async
 gdk_clipboard_read_text_finish
 gdk_clipboard_set_content
+gdk_clipboard_set
+gdk_clipboard_set_valist
+gdk_clipboard_set_value
 gdk_clipboard_set_text
 gdk_clipboard_set_texture
 

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 1d99534d3533e7473b036d7a0bbb2f49bdcd9415..dd75977c9656c84a7694530435a491332412c942 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -1668,19 +1668,10 @@ copy_file_location_cb (GSimpleAction *action,
   if (selected_files)
     {
       GdkClipboard *clipboard;
-      GdkContentProvider *provider;
-      GValue value = G_VALUE_INIT;
 
       clipboard = gtk_widget_get_clipboard (GTK_WIDGET (impl));
-
-      g_value_init (&value, GDK_TYPE_FILE_LIST);
-      g_value_take_boxed (&value, selected_files);
-
-      provider = gdk_content_provider_new_for_value (&value);
-      g_value_unset (&value);
-
-      gdk_clipboard_set_content (clipboard, provider);
-      g_object_unref (provider);
+      gdk_clipboard_set (clipboard, GDK_TYPE_FILE_LIST, selected_files);
+      g_slist_free_full (selected_files, g_object_unref);
     }
 }
 

diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index b7d18056a9200bf94df375d1618c67178b520fc9..1dba4c4e001c5bb9cf77637fbc6fd20de932d5e6 100644 (file)
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -3927,19 +3927,10 @@ cut_or_copy (GtkTextBuffer *buffer,
   if (!gtk_text_iter_equal (&start, &end))
     {
       GtkTextBuffer *contents;
-      GdkContentProvider *provider;
-      GValue value = G_VALUE_INIT;
 
       contents = create_clipboard_contents_buffer (buffer, &start, &end);
-
-      g_value_init (&value, GTK_TYPE_TEXT_BUFFER);
-      g_value_take_object (&value, contents);
-
-      provider = gdk_content_provider_new_for_value (&value);
-      g_value_unset (&value);
-
-      gdk_clipboard_set_content (clipboard, provider);
-      g_object_unref (provider);
+      gdk_clipboard_set (clipboard, GTK_TYPE_TEXT_BUFFER, contents);
+      g_object_unref (contents);
 
       if (delete_region_after)
         {